Merge pull request #587 from knu/scenario_import_force_utf8

Assume an uploaded scenario file (JSON) is encoded in UTF-8.

Akinori MUSHA 10 years ago
parent
commit
30d252f831
1 changed files with 1 additions and 1 deletions
  1. 1 1
      app/models/scenario_import.rb

+ 1 - 1
app/models/scenario_import.rb

@@ -111,7 +111,7 @@ class ScenarioImport
111 111
 
112 112
   def parse_file
113 113
     if data.blank? && file.present?
114
-      self.data = file.read
114
+      self.data = file.read.force_encoding(Encoding::UTF_8)
115 115
     end
116 116
   end
117 117